Merge with xenppc-unstable-merge.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 21 Mar 2007 23:59:03 +0000 (23:59 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Wed, 21 Mar 2007 23:59:03 +0000 (23:59 +0000)

Trivial merge